From 7ab5f8c5a7eb26ea3dfa77875eb97deef7e6d704 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Fri, 22 Jun 2001 18:11:04 +0000 Subject: [PATCH] Fix bug noticed by Brian Cameron. (gtk_tree_view_real_expand_row): Fix bug Fri Jun 22 14:06:08 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug noticed by Brian Cameron. (gtk_tree_view_real_expand_row): Fix bug noticed by Brian Cameron. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktreeview.c | 16 ++++++++-------- 8 files changed, 57 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61297f1fbd..fa8adf8144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jun 22 14:06:08 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug + noticed by Brian Cameron. + (gtk_tree_view_real_expand_row): Fix bug noticed by Brian + Cameron. + 2001-06-22 Hans Breuer * gdk/gdk.def : updated externals diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 61297f1fbd..fa8adf8144 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Fri Jun 22 14:06:08 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug + noticed by Brian Cameron. + (gtk_tree_view_real_expand_row): Fix bug noticed by Brian + Cameron. + 2001-06-22 Hans Breuer * gdk/gdk.def : updated externals diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 61297f1fbd..fa8adf8144 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Fri Jun 22 14:06:08 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug + noticed by Brian Cameron. + (gtk_tree_view_real_expand_row): Fix bug noticed by Brian + Cameron. + 2001-06-22 Hans Breuer * gdk/gdk.def : updated externals diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 61297f1fbd..fa8adf8144 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Fri Jun 22 14:06:08 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug + noticed by Brian Cameron. + (gtk_tree_view_real_expand_row): Fix bug noticed by Brian + Cameron. + 2001-06-22 Hans Breuer * gdk/gdk.def : updated externals diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 61297f1fbd..fa8adf8144 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Fri Jun 22 14:06:08 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug + noticed by Brian Cameron. + (gtk_tree_view_real_expand_row): Fix bug noticed by Brian + Cameron. + 2001-06-22 Hans Breuer * gdk/gdk.def : updated externals diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 61297f1fbd..fa8adf8144 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Fri Jun 22 14:06:08 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug + noticed by Brian Cameron. + (gtk_tree_view_real_expand_row): Fix bug noticed by Brian + Cameron. + 2001-06-22 Hans Breuer * gdk/gdk.def : updated externals diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 61297f1fbd..fa8adf8144 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Fri Jun 22 14:06:08 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug + noticed by Brian Cameron. + (gtk_tree_view_real_expand_row): Fix bug noticed by Brian + Cameron. + 2001-06-22 Hans Breuer * gdk/gdk.def : updated externals diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index feca314d73..03fa2003a7 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -7050,7 +7050,7 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view, gboolean open_all) { GtkTreeIter iter; - GtkTreeIter child; + GtkTreeIter temp; gboolean expand; if (node->children) @@ -7069,10 +7069,11 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view, node->children->parent_tree = tree; node->children->parent_node = node; - gtk_tree_model_iter_children (tree_view->priv->model, &child, &iter); + gtk_tree_model_iter_children (tree_view->priv->model, &temp, &iter); + temp = iter; gtk_tree_view_build_tree (tree_view, node->children, - &child, + &temp, gtk_tree_path_get_depth (path) + 1, open_all, GTK_WIDGET_REALIZED (tree_view)); @@ -7127,6 +7128,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view, GtkRBNode *node) { GtkTreeIter iter; + GtkTreeIter children; gboolean collapse; gtk_tree_model_get_iter (tree_view->priv->model, &iter, path); @@ -7136,13 +7138,11 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view, if (collapse) return FALSE; - TREE_VIEW_INTERNAL_ASSERT (gtk_tree_model_iter_children (tree_view->priv->model, - &iter, - &iter), - FALSE); + TREE_VIEW_INTERNAL_ASSERT (gtk_tree_model_iter_children (tree_view->priv->model, &children, &iter), FALSE); + children = iter; gtk_tree_view_discover_dirty (tree_view, node->children, - &iter, + &children, gtk_tree_path_get_depth (path)); /* Ensure we don't have a dangling pointer to a dead node */ -- 2.30.2